-
-
Notifications
You must be signed in to change notification settings - Fork 542
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Underbarrel Gun Attachments #3825
Merged
FalloutFalcon
merged 70 commits into
shiptest-ss13:master
from
Gristlebee:underbarrel-guns
Jan 6, 2025
Merged
Underbarrel Gun Attachments #3825
FalloutFalcon
merged 70 commits into
shiptest-ss13:master
from
Gristlebee:underbarrel-guns
Jan 6, 2025
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…test-Fork into underbarrel-guns
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
rye-rice
approved these changes
Dec 11, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
FalloutFalcon
requested changes
Jan 3, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
small questions but otherwise pretty happy with the code and a good feature!
code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
Outdated
Show resolved
Hide resolved
…ics.dm Co-authored-by: FalloutFalcon <[email protected]> Signed-off-by: Gristlebee <[email protected]>
FalloutFalcon
approved these changes
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Adds underbarrel gun attachments. Current roster is the underbarrel shotgun, e-gun, flamethrower, flaregun, riot grenade launcher, and 40mm grenade launcher. The first five can be bought from the outpost cargo.
Attachment removal now needs to be on harm intent in addition to the alt-click to avoid action conflicts.
Underbarrel guns can be fired/reloaded/interacted with by swapping the fire select to underbarrel.
Cleans up the riot grenade launcher code a bit.
Fixes runtimes caused by canceling attachment removal without selecting an attachment, and dropping cells from e-guns with an open latch.
Underbarrel gun sprites are recolors of Rye-rice's underbarrel grenade launcher.
Why It's Good For The Game
Adds some more customization and personalization options to a players loadout, and I think it's neat.
Changelog
🆑 Gristlebee, Rye-rice
add: Underbarrel guns
add: Hand attachment removal is bound to alt-click on harm intent.
fix: Grenade launcher code
fix: Runtimes
/:cl: